fixes, new components