+ some unit tests & other stuff