More Bug fixes

Start at Andrews page