real final fixes - lets get ready to rumble!