cosmetic changes
BUGFIX: multiple tiny bugs