Bug fixes and modify user module