Added update methods for User, removed shell header

Re-added check for straight_flush