some improvements - some things not working.
some improvements, some things not working