Adjustments + bugs fixing