stackato and small fixes
small style fixes