minor bugs fixed with extras