some minor fixes and prettifications