Improved build process and updated to CRUX 3.1