added hostname + fixed stuff