- several bug fixes, design improvements