Added advice
Bugs fixed