all new
fixed minor bugs