Answer to #27 and (some of) #24