Bug fixing, new components