added skill rolls
cleaned up code, commented a bit