start working on props

plus bug fixes