Various Updates

Fixed some models and merged some of the attachment changes from the
Master.
Removed Commented code
Merged in PR/44