fixed more stupid stuff