fixed everything, made recompilation faster