Bunch of stuff - lab on 4/22

Bunch of changes and bug fixes