Added content, code changes, bug fixes