bug fixes and speed improvements..