fixed errors and added modules