Added cancan

+some related fixes