various fixes, adding frames