fixed more more changes