Updated

Updated/added stuff