Cleaned up some files, worked on weapon hit test