Small updates and cleaning up

just a few small modifications and some beautification