Minor tweaks, design is still far from done