Improved init logic
Fixed a bug in init UI: --target option would had no effect