Added Draft 04 support and fixed a few bugs