Montecarlo in general basis I: replace hoft and goft site by general
version. Small cleanup + shortcutting of some variables.