New features and fixed errors