a few more changes
add cancan