cleaning up and merging latest branch

Feature/more than one deck