Added new types and fixed simple errors