last minute fixes.
more stuff