Added better initialization. #baelfire-2 done