bug fixes, working on speed.