#20 4.0.1 - Fixed Visual bugs, fixed some code

- Reworked, organised and commented code, removed redundant /unused
code. Working to Add restrictions now