Fixed some bugs and added some enhancements