Just some bug fixes and performance  improvements