finished some debugging and started to wrap up