Improved instructions
Bugfixes