[Minor] modifications to bring everything up to date!

Still need partial rewrite / full documentation