Fixed problems with current models and added more functionality.