some ocd fixes