added various stuff