minor fixes and new addition