fixed indent size and added more modules