Fix performance, bugs

Initial release. Only rudimentary testing has been done.