Bugfix close similar
Many bugfixs, all good