Fixed the issue!!

fixes #578 
fixes #537 
fixes #632 
fixes #753 
fixes #555