Most major bugs cleaned