You are 100% correct. In version 1.5 I made some changes to the items you specified above :) I hope they help out
