Various bug fixes and added types to List