Improvements and fixes... again...