energy bug fixes, added removing objects prototype