initial commit
some changes for marginal presentability