- minor updates and proper merge with the recent changes by Emo