init
various changes to working condition
change int to big int
populate and style changes
fixed whitespace issue
merge master