All done with new features and bug fixes