Added watchdog! and pickup and stuff

and just generally better