Code

Plug another memory leak and cleanup update start code while at it