Proper cracking, various bug fixes