Added tie option, cleanup