cleanup and more finalized layout. shrink pkg by 20MB