#30 testing and bug fixing.