fixed more problems