Fixed many smells