fixed refill form

several modifications.
removed commented code