fixed major lollipop issues