V0.1.1 swampwater, bugfixes, improvements