Touchups and bug fixing