Battery energy storage systems are a key factor for enabling a continuous increase of the fraction of photovoltaics in the Swedish electricity grid. One big challenge is to utilise all potential services of such a storage system. The aim of this study was to improve the supervisory controller for an existing battery storage and photovoltaic solution marketed by the Swedish company Ferroamp AB. This has been done by developing a combined peak reduction and time-of-use bill management algorithm, together with a simulation and evaluation software for optimisation of algorithm parameters. The algorithms and tools were evaluated using an installation made by Ferroamp AB and Vattenfall Eldistribution AB as a case study. Sensitivity analyses has been performed on economic parameters and length of the algorithm training data set. Improvement of economic profit, in this case study, were 300 % compared to the currently used algorithm and 32 % compared to a conventional threshold peak reduction algorithm. Despite this improvement, the battery energy storage system is shown to be non-profitable, with the economic profit only covering 36 % of the investment costs, not taking interest rate into account. Like in many other studies, power storage was found more profitable than energy storage. An increase of the grid power tariff and the grid energy fee of 30 % to 40 % is found to make the system viable. One interesting finding is that by using the proposed optimal algorithm, 55 % of the cycle life of the battery storage is still accessible for other services when considering 10 years of economic depreciation time for the system.