Cleaning and minor problem fixing