Fora update: fixes #42, fixes #43 and fixes #44