Fixed If commands
Printing variables fixed
Various fixes and enhancements