make some code prettier, update some behaviour