Added questions plus general cleanup and improvements
Disabled some inspections