Removed more redundant code & fixed some elements after change to embedded DB as opposed to PHP/MySQL version.