fixed a few bugs and enhanced performance