reverted custom libril
added some fixes