Fixed lots of issues at once.