last fixes, set correct tags and add me:)