Minor bug fixes, removed some annoying messages