fixed several small (cosmetic) issues
thx ronie