added last bits (ha hahaha...  like i'm done)