completely got rid of crack issues, mostly implementing the original paper idea for our case
removed some debug printf