Finishing touches (for dev version, at least)