Fixed stupid calculation and reworked messaging
Now there's only one todo left