Fixes and improvements

Good job, again!