Added more misc. stuff