just in the middle of bug fixing, commiting because it's in a relatively stable state.