fix things, and removed @tattyseal time code