Updated Design and some small fixes

Pretty much final Release