compiled, added finishing touches