fixed more ugly stuff