LCD keys and some cleanup