Bug Fixes and Pretty Print