Further fixes, cleanup and Decompose