fixed more stuff for final build