new stuff n fixes