Clean up package
Added some patches