some fixes and new screens