Omgosh fixed more bugs

These ones were synchronization in the join method. Hopefully I only
fixed and did not make more bugs in the process.