Fixed bugs, improved messages