Changes from labs

Updates that i emailed myself.