fixed more stuff