Finished APE4
Fixed some alignement in APE3