fixed bugs and user restrictions
fixed bugs and user restrictions