Fixed and improvents