Added Marshal Cache

Implemented and added a marshal cache and some small
updates to misc. files to get it working and cleaning
up some small stuff (line endings and what not)