Some updates

Addition to previous improvements. Up minor release