bug fix
Fixed and added features