fixed some framework problems