Some fixies and cleanup. Add item and user methods back