- fixing some more stuff