Removed redundants. Bug fixes.