New features

Fixed bugs