Fix #210 and some other misc styling improvements