Added commandline interface, some code cleanup, added uuid to the client_id