fixed more stuff thx to @cwansart