New target personal and few bug fixes