Removed localhost.localdomain
More TODOs
Refactored a bit. Removed useless password prompt