Fixed #3 and possibly #2 but not sure