Cleaned up bbox model code.
Added point model and cleaned up some code.