Tested updates

Tested the updates for bugs and fixed what I found.