polish, fixes.