fixed some framework issues.