fixed most of it!