fixed more stuff...