fixed compile errors from last commit, added more framework