Polished off model

new and exciting bugs