Added small name changes and added some TODOs. Also deleted extra
resources