added logs, some changes elsewhere
corrected helpers