Amalovichko

Fixes and improvements