Updated verbose output and some bug fixes