More bug fixes and pretty nice performance improvement