Fixed errors and added enhancements