bugs

some var missing and some appends to null