more bug fixes in everything is normal