Crystalline, Misc Fixes and Additions