added some screens and removed some warnings