Improvements and fixes (test sheet 0.4)