added breakpoints, cleaned shit up