Misc Fixes, add load/save descriptor