Add new executables+ minor modifications