Misc fixes and alpha catastrophe generator