Updated and added more functions/ aliases