Stable, all fixes implemented