Solved #12
Solved #15
Solved #16
Solved #17
Solved #18
Minor changes and debug-toolbar disabled