Additions & fixes