more minor corrections. Fully working now.