Fixed up some code and starting on retexturing