minor fix
Final Bug fixes