Amount Alignment

Plus some small compilation error fixed :(