bugfixes, playing around with things, etc.