small chenjes for state stuff
small changes in state management bluh
fixed locked screen bug