polish & bugfix