Removed unused api file
Updated overlay to be none local
Code fixes
Features tidy