bug fixes and frame stuff