classes moved, error fixes