lol
various bug fixes and performance enhancements