tighten up main a bit
testing code