Various bug fixes & Extra Credit Questions