fair bit of bug fixes. almost there