Minor fixes. It works now?!?!