fix #load and remaining issues
get some space