Updated functionality and code fixes.