whats here
Merged and fixed issues