Update todo statements
Fix some shader loading issues