Added little finishing touches