New features and fix bugs