Updates and reformatting
Further updates and start of toolbox