Adjust some technical details after further research