Make things more consistent, fix changing props