Adding final touches to make the shit work.