From Home 12/6/2014: More troubleshooting. No major modifications