Continued Testing

I continued to test the program, made some fixes, noted some weird bugs
that I am not yet able to fix.