-Some design changes, easier access to some functions (better visibility).

*Thanks for the feedback.