Bug Fix & Small Update