TODO added and bin.deb improved