Change some forum logic and add locking