Small changes and embarassing bug fix.