Removed minor bugs of last code additions.