minor tweaks, also changes from boxen