Helper Scripts

#101 + minor improvements