fixed more code mistakes