fixin the bugs