Various bug fixes, added more questions as well.