security and build bug fixed