Fixed issues after rebuild. Progress as of last night before Rake problem