Update 1.6

Most bugs corrected.