Less permissions, small bugs fixed
