Fixed couple of bugs, and added four new indices

Thanks @stgeorges!