fixed most of things