Changes reverted, mess ups fixed