fixes and added start from scratch