update components
fix options
Small bugfixes