Add delete container, try to simplify some edge cases

(halfway through making create fail on port changes)