Some minor refactorings
fixed casing and added tools
merged