Better apex support, fixed animation restarting, fix makefile