many updates, screens + general tweaks