prepared for 1.5.4 development, few unit tets aded