Minor resource optimization and minor bug fixes.