fixes to start and end