Not a ksp plugin

Misc fixes
done