polish & bugfix.