General improvements and Fat Jar