Improved costs (but still needs work) and hopefully fixed a bug

I forgot to commit this. Mainly commiting to update with my desktop. <3
Git.