Fixed some errors and also continued with packing. prepacking has been also checked