Fixed some things - should work now