Small bug fixes and made it less verbose.