Uploading all recent changes

Haven't really touched the github for this thing in a while so I'm
uploading all recent changes