Design revisions and QA fixes