fixes #14

change variable's name & fix border problem