Minor update (0.9i)

More tweaks and code formatting fixes