improvements and fixes project AC