cleaned up a little bit and updated deps