Now supports executables + bug fixes