Cleanup in marginal
Minor bug fixes