Added /water + small changes

MNiaM MNiaM