Making some changes, possibly first stable version