Small fixes and now also checking abandoned