Misc Fixes + Prototype