Updates + Lib + corrected image loading