Bug fixes big changes