Removing some junk and adding some coms