misc thoughts and one bugfix