Rearranging some assets, misc. code and comment fixes.