Lots of new fixes/additions!!!