added misc. stuff