Small fixes. Works fine now.