general testing

general testing and some formating changes