added floor and redesigned inital conditions
merge?
Merge pull request #7 from eganhila/master

floor and redesigned init