3 old bugs fixed, new added