Refactored names, fixed minor runtime bugs
Removing cached files