Eluna attempt unix compile fix & enhance code
Eluna fix whitespace
Eluna fix declarations