user fixes, and restritions