Added Maven + fixes