Version/1.5

Further cleanup and updates!