Lots of fixes. Now looks decent.