fixed some leaking issues and pictures adjustments