More bug fixes

+Re-added resources that should not of been removed
+Removed a function call that doesn't exist