Aside added + fixes