fixed most errors for initial push