Last commit was a mistake. Bug fixes.