7/13 Update Commit

Admin edit obj Bugs included. Use at own risk