got rid of warnings
refactored a bit more
fixed orientation activity recreation crash