Various amount of work done. A few bugs fixed.