added more ignore
fixed many bugs