cleanup of code, commented, final implenentation of nicksevr