some final changes to initial version