Closes #44 : Fixes regressions, Closes #76 : More margins