Fix Software and Hardware Errors

Fix Software and Hardware Errors