catching 500 as well
reording aot to match compilation deps
indenting
adding doc