Some tweaks, now implementing different data types.