bug fixes and better exec