added some fixes and the bach