luckyfixes, some work on statements