managed to get bndtools running again; also cleaned up old stuff