Did some misc. TO-DOs