Improved Performance, and added TapLib