cleanup; fixed sll warnings