Version 1.0 finishing touches