Several bug fixes & code addition