merge of versions / some fixes

made 1 version which is neater