fixing my part of bugs