Added a few small tips and tricks