Fixing some investing bugs, not too many though, don't want to get caught