Code cleanup + IP address support + errors mgmt