fixed more make things