+Improvements, testing & 2 math mistakes :P