remove form default data

Signed-off-by: Hank Wang <drapho@gmail.com>
fixes few bugs

Signed-off-by: Hank Wang <drapho@gmail.com>
fixes #1, #2

Signed-off-by: Hank Wang <drapho@gmail.com>