Update

Some bug fixes, new design.