fixed and tidied up some framework stuff