Fixed one problem..now there are more
Merged stuff