..F....... [DEV-533] fixed formatting; fixed minor bugs