Fixed several bugs, so now it starts to look right again.