fixes in details