buncha random improvements
convert to a maven project