bug fix
fixed unused warnings
bug fix