code progression, bug fixes