New images added, logical bugs fixed