Security issues, error handling, minor bug fixes.