working more or less
updated deps