bug fixes

double declaration :s