Fixed issues

Something wonky happened where I committed twice and only the second one got pushed, so it looks like I barely changed anything with the github highligthing. All the changes are there though.