normalized everything consistently, closes #156