tweaks and added closed at