improvements, add commits etc